xm,xend: A few fixes for changeset 20314

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index 6cb738e93e99daab410c1b1d73eb3aa7f18c04dc..975766bcd7dabf08e55ba27c12cea2cbf7259ded 100644 (file)
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -1902,9 +1902,10 @@ class XendAPI(object):
         port = other_config.get("port", 0)
         node = other_config.get("node", -1)
         ssl = other_config.get("ssl", None)
+        chs = other_config.get("change_home_server", False)
         
         xendom.domain_migrate(xeninfo.getDomid(), destination_url,
-                              bool(live), port, node, ssl)
+                              bool(live), port, node, ssl, bool(chs))
         return xen_api_success_void()
 
     def VM_save(self, _, vm_ref, dest, checkpoint):

diff --git a/tools/python/xen/xend/server/SrvDomain.py b/tools/python/xen/xend/server/SrvDomain.py
index b76c7b365235b79e9c5145990642591c3e32d61b..97887af61a25693f3e0e6a8a493db03d6b0785a3 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomain.py
+++ b/tools/python/xen/xend/server/SrvDomain.py
@@ -118,7 +118,8 @@ class SrvDomain(SrvDir):
                      ['live',        'int'],
                      ['port',        'int'],
                      ['node',        'int'],
-                     ['ssl',         'int']])
+                     ['ssl',         'int'],
+                     ['change_home_server', 'bool']])
         return fn(req.args, {'dom': self.dom.domid})
 
     def op_pincpu(self, _, req):

diff --git a/tools/python/xen/xm/migrate.py b/tools/python/xen/xm/migrate.py
index 220f09198a3ca5f5947bdc5cdb240f3b442dcafb..c1ea19d6cb9f5bfb2a6794857a2429dfd28270b2 100644 (file)
--- a/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@ -74,7 +74,8 @@ def main(argv):
         other_config = {
             "port":     opts.vals.port,
             "node":     opts.vals.node,
-            "ssl":      opts.vals.ssl
+            "ssl":      opts.vals.ssl,
+            "change_home_server": opts.vals.change_home_server
             }
         server.xenapi.VM.migrate(vm_ref, dst, bool(opts.vals.live),
                                  other_config)